From 71667e4d6d8dcdb7bf52b9b0dcafec21f4bda98b Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Fri, 28 Apr 2023 19:04:31 -0400
Subject: android: Allow search bar to scroll offscreen

---
 .../src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt    |  1 +
 .../main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt    |  8 +++-----
 src/android/app/src/main/res/layout/fragment_games.xml     | 14 ++++----------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
index 5c58dd255..3ca529b20 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt
@@ -125,6 +125,7 @@ class GamesFragment : Fragment() {
                 TransitionState.HIDING -> {
                     gamesViewModel.setSearchedGames(emptyList())
                     searchHidden()
+                    binding.appBarSearch.setExpanded(true)
                 }
             }
         }
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
index a33469644..e8284471a 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@@ -75,11 +75,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         setUpNavigation(navHostFragment.navController)
 
         binding.statusBarShade.setBackgroundColor(
-            ThemeHelper.getColorWithOpacity(
-                MaterialColors.getColor(
-                    binding.root,
-                    R.attr.colorSurface
-                ), ThemeHelper.SYSTEM_BAR_ALPHA
+            MaterialColors.getColor(
+                binding.root,
+                R.attr.colorSurface
             )
         )
 
diff --git a/src/android/app/src/main/res/layout/fragment_games.xml b/src/android/app/src/main/res/layout/fragment_games.xml
index 5cfe76de3..c4c3eacf4 100644
--- a/src/android/app/src/main/res/layout/fragment_games.xml
+++ b/src/android/app/src/main/res/layout/fragment_games.xml
@@ -44,20 +44,14 @@
         android:id="@+id/app_bar_search"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
         app:liftOnScrollTargetViewId="@id/grid_games">
 
-        <FrameLayout
+        <com.google.android.material.search.SearchBar
+            android:id="@+id/search_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fitsSystemWindows="true">
-
-            <com.google.android.material.search.SearchBar
-                android:id="@+id/search_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/home_search_games" />
-
-        </FrameLayout>
+            android:hint="@string/home_search_games" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-- 
cgit v1.2.3